From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Mar 2013 17:37:57 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~229^2~63^2~57
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b;p=emacs.git

Merge from trunk.
---

f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b